added static name for BablSampling

diff --git a/ChangeLog b/ChangeLog
index 986fc0f1d9b83aac354182e71de9f89096b5cf54..effa0f6419fd807cc056e3a68a89558e11c29f32 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-16  Øyvind Kolås  <pippin@gimp.org>
+
+       * babl/babl-classes.h: (BablSampling) added static name.
+       * babl/babl-sampling.c: (babl_sampling_init): initialize names
+       * babl/babl-introspect.c: (pixel_format_introspect): display sampling
+       name as well.
+
 2005-08-16  Øyvind Kolås  <pippin@gimp.org>
 
        * babl/babl-component.[ch]

diff --git a/babl/babl-classes.h b/babl/babl-classes.h
index a4f0786d759d8fb79d95bd5ddf5a7a5d1c41dd8f..a11f2aef19fc3532923951ba9280b665079e7ca6 100644 (file)
--- a/babl/babl-classes.h
+++ b/babl/babl-classes.h
@@ -142,6 +142,7 @@ typedef struct
   BablConversion **to;   /*< NULL terminated list of conversions to class   */
   int          horizontal;
   int          vertical;
+  char         name[4];
 } BablSampling;
 
 typedef struct

diff --git a/babl/babl-introspect.c b/babl/babl-introspect.c
index 36b35fd9b62e26941734b08a1b4f298ac9de5f3d..001a41d71fc7422a9bd8690ac74c0cb0d8f02cb3 100644 (file)
--- a/babl/babl-introspect.c
+++ b/babl/babl-introspect.c
@@ -143,9 +143,10 @@ pixel_format_introspect (Babl *babl)
 
   for (i=0; i< babl->pixel_format.bands; i++)
     {
-      babl_log ("\t\tband[%i] type='%s' component='%s'",
-                i,  ( BABL(babl->pixel_format.type[i]     ))->instance.name,
-                    ( BABL(babl->pixel_format.component[i]))->instance.name);
+      babl_log ("\t\tband[%i] type='%s' component='%s' sampling='%s'",
+                i,   babl->pixel_format.type[i]->instance.name,
+                     babl->pixel_format.component[i]->instance.name,
+                     babl->pixel_format.sampling[i]->instance.name);
     }
 }
 

diff --git a/babl/babl-sampling.c b/babl/babl-sampling.c
index a5e813d925fd7e45563b8f0e8dc539a6a798ebf5..e95f87d91f3f40b55707261c7566244defe50599 100644 (file)
--- a/babl/babl-sampling.c
+++ b/babl/babl-sampling.c
@@ -87,8 +87,12 @@ babl_sampling_init (void)
         int index= (vertical-VERTICAL_MIN) * VERTICAL_MAX + (horizontal - HORIZONTAL_MIN);
         db[index].instance.class_type = BABL_SAMPLING;
         db[index].instance.id = 0;
-        db[index].instance.name = "Samplings have no name";
         db[index].horizontal = horizontal;
         db[index].vertical   = vertical;
+        db[index].instance.name = db[index].name;
+        db[index].name[0]='0'+horizontal;
+        db[index].name[1]=':';
+        db[index].name[2]='0'+vertical;
+        db[index].name[3]='\0';
       }
 }